Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

boards generator: updates #5103

Merged
merged 5 commits into from
Sep 3, 2018
Merged

boards generator: updates #5103

merged 5 commits into from
Sep 3, 2018

Conversation

d-a-v
Copy link
Collaborator

@d-a-v d-a-v commented Sep 3, 2018 •
edited
Loading

  • simplified mapping description: only flash and spiffs sizes
  • flash description - almost no more magic len or addresses
  • some ldscripts are renamed due to autogenerated names
  • verbose when generating
    • 2M / no spiffs
    • 2M / 512K spiffs
    • 4M / no spiffs

@d-a-v
boards generator: updates:
9bc9e90 
* simplified mapping description: only flash and spiffs sizes
* flash description - almost no more magic len or addresses
* some ldscripts are renamed due to autogenerated names
* + 2M / no spiffs
* + 2M / 512K spiffs
@d-a-v d-a-v requested a review from igrr September 3, 2018 00:53
This was referenced Sep 3, 2018
Closed
Closed
@d-a-v
Copy link
Collaborator Author

d-a-v commented Sep 3, 2018

To try this PR, tools/boards.txt.py should simply be replaced by this one

igrr
igrr reviewed Sep 3, 2018
View reviewed changes
tools/boards.txt.py Outdated
( '.menu.CpuFrequency.80.build.f_cpu', '80000000L' ),
( '.menu.CpuFrequency.160', '160 MHz' ),
( '.menu.CpuFrequency.160.build.f_cpu', '160000000L' ),
( '.menu.cpuHz.80', '80 MHz' ),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that if you change names here, you also need to update

Arduino/tools/build.py

Lines 47 to 55 in c33ef89

cmd += '-fqbn=esp8266com:esp8266:{board_name}:' \
'CpuFrequency={cpu_freq},' \
'FlashFreq={flash_freq},' \
'FlashMode={flash_mode},' \
'UploadSpeed=921600,' \
'FlashSize={flash_size},' \
'ResetMethod=nodemcu'.format(**vars(args))
if args.debug_port and args.debug_level:
cmd += 'Debug={debug_port},DebugLevel={debug_level}'.format(**vars(args))
.

tools/boards.txt.py Outdated
# | flash | reserved | empty | spiffs | eeprom | rf

eeprom_size_kb = 4
rf_size_kb = 16
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rfcal (4kB) + sdk (wifi) settings (12kB)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@igrr
Copy link
Member

igrr commented Sep 3, 2018

tools/build.py also needs an update if the build option names change.

@d-a-v d-a-v mentioned this pull request Sep 3, 2018
Closed
devyte
devyte approved these changes Sep 3, 2018
View reviewed changes
Copy link
Collaborator

@devyte devyte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@d-a-v d-a-v merged commit cc0bfa0 into esp8266:master Sep 3, 2018
@d-a-v d-a-v deleted the boardsgen branch September 3, 2018 20:29
TD-er added a commit to TD-er/ESPEasy that referenced this pull request Sep 3, 2018
@TD-er
[Shelly1] Test build using 2M512 flash layout to allow OTA
7296f62 
Just merged new flash layout: esp8266/Arduino#5103
So as a test, using the staged version.
@TD-er TD-er mentioned this pull request Sep 3, 2018
Closed
@d-a-v d-a-v mentioned this pull request Sep 4, 2018
Closed
@crankyoldgit crankyoldgit mentioned this pull request Dec 28, 2018
Merged
@OttoWinter OttoWinter mentioned this pull request Jan 1, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@igrr igrr igrr left review comments

@devyte devyte devyte approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@d-a-v @igrr @devyte